From 336055ab1fe1518ef503e076df5511c06591912b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sun, 11 Jul 2021 14:18:54 +0200 Subject: [PATCH] debian: Use dh 13 substitutions for install files instead of .in files --- debian/gir1.2-gtk-4.0.install | 2 +- debian/libgtk-4-1-udeb.install | 2 +- debian/libgtk-4-1.install | 2 ++ debian/libgtk-4-1.install.in | 2 -- .../{libgtk-4-1.links.in => libgtk-4-1.links} | 0 ...bgtk-4-bin.links.in => libgtk-4-bin.links} | 0 ...mon.install.in => libgtk-4-common.install} | 0 debian/libgtk-4-dev.install | 4 +-- ...bgtk-4-dev.links.in => libgtk-4-dev.links} | 0 debian/libgtk-4-doc.install | 5 +++ debian/libgtk-4-doc.install.in | 5 --- debian/libgtk-4-doc.links | 16 +++++++++ debian/libgtk-4-doc.links.in | 16 --------- debian/rules | 35 ++++++++----------- 14 files changed, 42 insertions(+), 47 deletions(-) create mode 100644 debian/libgtk-4-1.install delete mode 100644 debian/libgtk-4-1.install.in rename debian/{libgtk-4-1.links.in => libgtk-4-1.links} (100%) rename debian/{libgtk-4-bin.links.in => libgtk-4-bin.links} (100%) rename debian/{libgtk-4-common.install.in => libgtk-4-common.install} (100%) rename debian/{libgtk-4-dev.links.in => libgtk-4-dev.links} (100%) create mode 100644 debian/libgtk-4-doc.install delete mode 100644 debian/libgtk-4-doc.install.in create mode 100644 debian/libgtk-4-doc.links delete mode 100644 debian/libgtk-4-doc.links.in diff --git a/debian/gir1.2-gtk-4.0.install b/debian/gir1.2-gtk-4.0.install index 9038727d6e..6ec97965c4 100644 --- a/debian/gir1.2-gtk-4.0.install +++ b/debian/gir1.2-gtk-4.0.install @@ -1 +1 @@ -usr/lib/*/girepository-1.0/ +${env:LIBDIR}/girepository-1.0/ diff --git a/debian/libgtk-4-1-udeb.install b/debian/libgtk-4-1-udeb.install index 62e7ea4de8..66c6b91eab 100644 --- a/debian/libgtk-4-1-udeb.install +++ b/debian/libgtk-4-1-udeb.install @@ -1 +1 @@ -usr/lib/*/libg?k*.so.* +${env:LIBDIR}/libg?k*.so.* diff --git a/debian/libgtk-4-1.install b/debian/libgtk-4-1.install new file mode 100644 index 0000000000..410a049226 --- /dev/null +++ b/debian/libgtk-4-1.install @@ -0,0 +1,2 @@ +${env:MODULES_BASE_PATH}/printbackends/*.so +${env:LIBDIR}/libgtk*.so.* diff --git a/debian/libgtk-4-1.install.in b/debian/libgtk-4-1.install.in deleted file mode 100644 index 8df8b20815..0000000000 --- a/debian/libgtk-4-1.install.in +++ /dev/null @@ -1,2 +0,0 @@ -@MODULES_BASE_PATH@/printbackends/*.so -@LIBDIR@/libgtk*.so.* diff --git a/debian/libgtk-4-1.links.in b/debian/libgtk-4-1.links similarity index 100% rename from debian/libgtk-4-1.links.in rename to debian/libgtk-4-1.links diff --git a/debian/libgtk-4-bin.links.in b/debian/libgtk-4-bin.links similarity index 100% rename from debian/libgtk-4-bin.links.in rename to debian/libgtk-4-bin.links diff --git a/debian/libgtk-4-common.install.in b/debian/libgtk-4-common.install similarity index 100% rename from debian/libgtk-4-common.install.in rename to debian/libgtk-4-common.install diff --git a/debian/libgtk-4-dev.install b/debian/libgtk-4-dev.install index 97cef6b2f1..2d01bcee15 100644 --- a/debian/libgtk-4-dev.install +++ b/debian/libgtk-4-dev.install @@ -1,6 +1,6 @@ usr/include/gtk* -usr/lib/*/libgtk*.so -usr/lib/*/pkgconfig/g?k* +${env:LIBDIR}/libgtk*.so +${env:LIBDIR}/pkgconfig/g?k* usr/share/gettext/its/gtk4builder.its usr/share/gettext/its/gtk4builder.loc usr/share/gir-1.0 diff --git a/debian/libgtk-4-dev.links.in b/debian/libgtk-4-dev.links similarity index 100% rename from debian/libgtk-4-dev.links.in rename to debian/libgtk-4-dev.links diff --git a/debian/libgtk-4-doc.install b/debian/libgtk-4-doc.install new file mode 100644 index 0000000000..a138dd6236 --- /dev/null +++ b/debian/libgtk-4-doc.install @@ -0,0 +1,5 @@ +usr/share/doc/gdk4 usr/share/doc/${env:DOC_PKG} +usr/share/doc/gdk4-wayland usr/share/doc/${env:DOC_PKG} +usr/share/doc/gdk4-x11 usr/share/doc/${env:DOC_PKG} +usr/share/doc/gsk4 usr/share/doc/${env:DOC_PKG} +usr/share/doc/gtk4 usr/share/doc/${env:DOC_PKG} diff --git a/debian/libgtk-4-doc.install.in b/debian/libgtk-4-doc.install.in deleted file mode 100644 index 1859211574..0000000000 --- a/debian/libgtk-4-doc.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/share/doc/gdk4 usr/share/doc/@DOC_PKG@ -usr/share/doc/gdk4-wayland usr/share/doc/@DOC_PKG@ -usr/share/doc/gdk4-x11 usr/share/doc/@DOC_PKG@ -usr/share/doc/gsk4 usr/share/doc/@DOC_PKG@ -usr/share/doc/gtk4 usr/share/doc/@DOC_PKG@ diff --git a/debian/libgtk-4-doc.links b/debian/libgtk-4-doc.links new file mode 100644 index 0000000000..0387789466 --- /dev/null +++ b/debian/libgtk-4-doc.links @@ -0,0 +1,16 @@ +usr/share/doc/${env:DOC_PKG}/gdk4 usr/share/doc/${env:DEV_PKG}/gdk4 +usr/share/doc/${env:DOC_PKG}/gdk4 usr/share/gtk-doc/html/gdk4 +usr/share/doc/${env:DOC_PKG}/gdk4-wayland usr/share/doc/${env:DEV_PKG}/gdk4-wayland +usr/share/doc/${env:DOC_PKG}/gdk4-wayland usr/share/gtk-doc/html/gdk4-wayland +usr/share/doc/${env:DOC_PKG}/gdk4-x11 usr/share/doc/${env:DEV_PKG}/gdk4-x11 +usr/share/doc/${env:DOC_PKG}/gdk4-x11 usr/share/gtk-doc/html/gdk4-x11 +usr/share/doc/${env:DOC_PKG}/gsk4 usr/share/doc/${env:DEV_PKG}/gsk4 +usr/share/doc/${env:DOC_PKG}/gsk4 usr/share/gtk-doc/html/gsk4 +usr/share/doc/${env:DOC_PKG}/gtk4 usr/share/doc/${env:DEV_PKG}/gtk4 +usr/share/doc/${env:DOC_PKG}/gtk4 usr/share/gtk-doc/html/gtk4 +usr/share/doc/libglib2.0-doc/glib usr/share/doc/${env:DEV_PKG}/glib +usr/share/doc/libglib2.0-doc/glib usr/share/doc/${env:DOC_PKG}/glib +usr/share/doc/libglib2.0-doc/gobject usr/share/doc/${env:DEV_PKG}/gobject +usr/share/doc/libglib2.0-doc/gobject usr/share/doc/${env:DOC_PKG}/gobject +usr/share/doc/libpango1.0-doc/pango usr/share/doc/${env:DEV_PKG}/pango +usr/share/doc/libpango1.0-doc/pango usr/share/doc/${env:DOC_PKG}/pango diff --git a/debian/libgtk-4-doc.links.in b/debian/libgtk-4-doc.links.in deleted file mode 100644 index 5621c97bee..0000000000 --- a/debian/libgtk-4-doc.links.in +++ /dev/null @@ -1,16 +0,0 @@ -usr/share/doc/@DOC_PKG@/gdk4 usr/share/doc/@DEV_PKG@/gdk4 -usr/share/doc/@DOC_PKG@/gdk4 usr/share/gtk-doc/html/gdk4 -usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/doc/@DEV_PKG@/gdk4-wayland -usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/gtk-doc/html/gdk4-wayland -usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/doc/@DEV_PKG@/gdk4-x11 -usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/gtk-doc/html/gdk4-x11 -usr/share/doc/@DOC_PKG@/gsk4 usr/share/doc/@DEV_PKG@/gsk4 -usr/share/doc/@DOC_PKG@/gsk4 usr/share/gtk-doc/html/gsk4 -usr/share/doc/@DOC_PKG@/gtk4 usr/share/doc/@DEV_PKG@/gtk4 -usr/share/doc/@DOC_PKG@/gtk4 usr/share/gtk-doc/html/gtk4 -usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DEV_PKG@/glib -usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib -usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DEV_PKG@/gobject -usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject -usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DEV_PKG@/pango -usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DOC_PKG@/pango diff --git a/debian/rules b/debian/rules index 785a65cff3..0a3b94955a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,32 +14,32 @@ LDFLAGS += -Wl,-z,defs # Make the linker work a bit harder so dynamic loading can be done faster LDFLAGS += -Wl,-O1 -APIVER := 4 -SONAME := 1 +export APIVER := 4 +export SONAME := 1 -LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH) +export LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH) # earliest version that this release has backwards binary compatibility for -GTK_BINARY_VERSION := 4.0.0 +export GTK_BINARY_VERSION := 4.0.0 # Gtk binary version virtual Provide -GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION) +export GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION) # relative base directory for configuration -CONFDIR := etc/gtk-4.0 +export CONFDIR := etc/gtk-4.0 # relative base directory for all types of modules -MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION) +export MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION) # package names -SHARED_PKG := libgtk-$(APIVER)-$(SONAME) -COMMON_PKG := libgtk-$(APIVER)-common -DEV_PKG := libgtk-$(APIVER)-dev -UDEB_PKG := $(SHARED_PKG)-udeb -DOC_PKG := libgtk-$(APIVER)-doc -BIN_PKG := libgtk-$(APIVER)-bin -EXAMPLES_PKG := gtk-$(APIVER)-examples -TESTS_PKG := gtk-$(APIVER)-tests +export SHARED_PKG := libgtk-$(APIVER)-$(SONAME) +export COMMON_PKG := libgtk-$(APIVER)-common +export DEV_PKG := libgtk-$(APIVER)-dev +export UDEB_PKG := $(SHARED_PKG)-udeb +export DOC_PKG := libgtk-$(APIVER)-doc +export BIN_PKG := libgtk-$(APIVER)-bin +export EXAMPLES_PKG := gtk-$(APIVER)-examples +export TESTS_PKG := gtk-$(APIVER)-tests # files larger than 4k in size will be compressed by dh_compress # so append a .gz suffix to avoid dangling symlinks @@ -55,7 +55,6 @@ debian/%: debian/%.in sed \ -e "s#@SONAME@#$(SONAME)#g" \ -e "s#@APIVER@#$(APIVER)#g" \ - -e "s#@VERSION@#$(DEB_VERSION_UPSTREAM)#g" \ -e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \ -e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \ -e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \ @@ -66,12 +65,8 @@ debian/%: debian/%.in -e "s#@EXAMPLES_PKG@#$(EXAMPLES_PKG)#g" \ -e "s#@TESTS_PKG@#$(TESTS_PKG)#g" \ -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \ - -e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \ -e "s#@LIBDIR@#$(LIBDIR)#g" \ - -e 's#@CONFDIR@#$(CONFDIR)#g' \ -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ - -e "s#@NEWS@#$(NEWS)#g" \ - -e "s#@README.md@#$(README.md)#g" \ $@.in > $@ configure_flags_common = \ -- 2.30.2